Auto merge of #4138 - alexcrichton:fix-tests, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 7 Jun 2017 15:42:07 +0000 (15:42 +0000)
committerbors <bors@rust-lang.org>
Wed, 7 Jun 2017 15:42:07 +0000 (15:42 +0000)
commitceb23c46f99882da1d7a0694aebbbc944280829c
tree5a497f58ceb7d7e88cdb870f307b960cd0b2f71d
parentbbfe9b3a9d64aa8698b18cbb3803b3fa00ee3f44
parentdd7a713b73722291ba4ad7e6bad4f6180365e7e6
Auto merge of #4138 - alexcrichton:fix-tests, r=alexcrichton

Fix tests on beta

Had a few usages of `-Z` leak out of the nightly channel.